Avoid some compiler warnings (#507000).

* gtk/gtkbuilder.c, gtk/gtkbuilderprivate.h: Use proper sign
for value argument of _gtk_builder_flags_from_string.
* gtk/gtkwidget.c: Don't alias the child pointer passed
to gdk_window_get_user_data.

svn path=/trunk/; revision=19306

diff --git a/ChangeLog b/ChangeLog
index 64b0522833b1792a8ee6f9536d85a2f70034b1e3..69119dee5916d4df185a3ed49c3588577705975b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2008-01-04  Mathias Hasselmann  <mathias@openismus.com>
+
+       Avoid some compiler warnings (#507000).
+
+       * gtk/gtkbuilder.c, gtk/gtkbuilderprivate.h: Use proper sign
+       for value argument of _gtk_builder_flags_from_string.
+       * gtk/gtkwidget.c: Don't alias the child pointer passed
+       to gdk_window_get_user_data.
+
 2008-01-04  Michael Natterer  <mitch@imendio.com>
 
        * gdk/x11/gdkinput-x11.c (_gdk_device_get_history): don't forget

diff --git a/gtk/gtkbuilder.c b/gtk/gtkbuilder.c
index 263698b22af77197fb5bdd888c060c3da85428f4..bc9551fed531caf094a51d34ece98ea5d960851d 100644 (file)
--- a/gtk/gtkbuilder.c
+++ b/gtk/gtkbuilder.c
@@ -1111,7 +1111,8 @@ gtk_builder_value_from_string_type (GtkBuilder   *builder,
       }
     case G_TYPE_FLAGS:
       {
-       gint flags_value;
+       guint flags_value;
+
        if (!_gtk_builder_flags_from_string (type, string, &flags_value, error))
          {
            ret = FALSE;
@@ -1293,7 +1294,7 @@ _gtk_builder_enum_from_string (GType         type,
 gboolean
 _gtk_builder_flags_from_string (GType         type, 
                                 const gchar  *string,
-                               gint         *flags_value,
+                               guint        *flags_value,
                                GError      **error)
 {
   GFlagsClass *fclass;

diff --git a/gtk/gtkbuilderprivate.h b/gtk/gtkbuilderprivate.h
index bcb8d898458bf6ea334865ac9c8140d53b5d22dd..e04911c65e0dba99467b0ea735001fe93b2c1654 100644 (file)
--- a/gtk/gtkbuilderprivate.h
+++ b/gtk/gtkbuilderprivate.h
@@ -116,7 +116,7 @@ gboolean _gtk_builder_boolean_from_string (const gchar  *string,
                                           GError      **error);
 gboolean  _gtk_builder_flags_from_string (GType       type,
                                          const char *string,
-                                         gint       *value,
+                                         guint      *value,
                                          GError    **error);
 
 #endif /* __GTK_BUILDER_PRIVATE_H__ */

diff --git a/gtk/gtkwidget.c b/gtk/gtkwidget.c
index faaa7d600a5034d45675991df7c34a99618b91cf..1aa1bba1759dd9302cb8dd3735a195d122f6f2b5 100644 (file)
--- a/gtk/gtkwidget.c
+++ b/gtk/gtkwidget.c
@@ -4762,12 +4762,12 @@ gtk_widget_reparent_subwindows (GtkWidget *widget,
 
       for (tmp_list = children; tmp_list; tmp_list = tmp_list->next)
        {
-         GtkWidget *child;
          GdkWindow *window = tmp_list->data;
+         gpointer child;
 
-         gdk_window_get_user_data (window, (void **)&child);
+         gdk_window_get_user_data (window, &child);
          while (child && child != widget)
-           child = child->parent;
+           child = ((GtkWidget*) child)->parent;
 
          if (child)
            gdk_window_reparent (window, new_window, 0, 0);
@@ -4790,10 +4790,11 @@ gtk_widget_reparent_subwindows (GtkWidget *widget,
         
         for (tmp_list = children; tmp_list; tmp_list = tmp_list->next)
           {
-            GtkWidget *child;
             GdkWindow *window = tmp_list->data;
-            
-            gdk_window_get_user_data (window, (void **)&child);
+            gpointer child;
+
+            gdk_window_get_user_data (window, &child);
+
             if (child == widget)
               gdk_window_reparent (window, new_window, 0, 0);
           }